@adminforth/markdown 1.10.12 → 1.11.1

package/build.log

@@ -14,5 +14,5 @@ custom/tsconfig.json
 custom/utils/
 custom/utils/monacoMarkdownToggle.ts
 
-sent 52,957 bytes  received 180 bytes  106,274.00 bytes/sec
+sent 52,947 bytes  received 180 bytes  106,254.00 bytes/sec
 total size is 52,265  speedup is 0.98

package/dist/index.js

@@ -19,11 +19,24 @@ export default class MarkdownPlugin extends AdminForthPlugin {
     }
     // Placeholder for future Upload Plugin API integration.
     // For now, treat all extracted URLs as plugin-owned public URLs.
-    isPluginPublicUrl(_url) {
-        // todo: here we need to check that host name is same as upload plugin, probably create upload plugin endpoint
-        // should handle cases that user might define custom preview url
-        // and that local storage has no host name, here, the fact of luck of hostname might be used as 
-        return true;
+    isUrlFromPlugin(url) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.uploadPlugin)
+                return false;
+            try {
+                const uploadPlugin = this.uploadPlugin;
+                if (typeof uploadPlugin.isInternalUrl === 'function') {
+                    return yield uploadPlugin.isInternalUrl(url);
+                }
+                else {
+                    throw new Error('Please update upload plugin and storage adapter');
+                }
+            }
+            catch (err) {
+                console.error(`[MarkdownPlugin] Error checking URL ${url}:`, err);
+            }
+            return false;
+        });
     }
     validateConfigAfterDiscover(adminforth, resourceConfig) {
         this.adminforth = adminforth;
@@ -145,23 +158,33 @@ export default class MarkdownPlugin extends AdminForthPlugin {
                     }
                     catch (_a) {
                         // Fallback: strip scheme/host if it looks like a URL, otherwise treat as a path.
-                        return stripQueryAndHash(url).replace(/^https?:\/\/[^\/]+\/+/, '').replace(/^\/+/, '');
+                        const key = stripQueryAndHash(url).replace(/^https?:\/\/[^\/]+\/+/, '').replace(/^\/+/, '');
+                        // since only local storage adapter returns non-URL paths
+                        // we need to cut-off express-base
+                        // e.g. /uploaded-static/cars_description_images-74bbe25a154500c4a2fcb91fb91cea75/sqlite/images_1775114133312.webp
+                        // should become /sqlite/images_1775114133312.webp
+                        const cutted = key.split("/").filter(Boolean).slice(2).join("/");
+                        return cutted;
                     }
                 };
                 const shouldTrackUrl = (url) => {
                     try {
-                        return this.isPluginPublicUrl(url);
+                        return this.isUrlFromPlugin(url);
                     }
                     catch (err) {
                         console.error('Error checking URL ownership', url, err);
                         return false;
                     }
                 };
-                const getKeyFromTrackedUrl = (rawUrl) => {
+                const getKeyFromTrackedUrl = (rawUrl) => __awaiter(this, void 0, void 0, function* () {
                     const srcTrimmed = rawUrl.trim().replace(/^<|>$/g, '');
                     if (!srcTrimmed || srcTrimmed.startsWith('data:') || srcTrimmed.startsWith('javascript:')) {
                         return null;
                     }
+                    const isInternal = yield this.isUrlFromPlugin(srcTrimmed);
+                    if (!isInternal) {
+                        return null;
+                    }
                     if (!shouldTrackUrl(srcTrimmed)) {
                         return null;
                     }
@@ -171,7 +194,7 @@ export default class MarkdownPlugin extends AdminForthPlugin {
                         return null;
                     }
                     return decodeURIComponent(key);
-                };
+                });
                 const upsertMeta = (byKey, key, next) => {
                     var _a, _b;
                     const existing = byKey.get(key);
@@ -201,38 +224,40 @@ export default class MarkdownPlugin extends AdminForthPlugin {
                     return cleaned || null;
                 };
                 function getAttachmentMetas(markdown) {
-                    var _a, _b, _c, _d, _e, _f;
-                    if (!markdown) {
-                        return [];
-                    }
-                    // Markdown image syntax: ![alt](src) or ![alt](src "title") or ![alt](src 'title')
-                    const imageRegex = /!\[([^\]]*)\]\(\s*([^\s)]+)\s*(?:\s+(?:\"([^\"]*)\"|'([^']*)'))?\s*\)/g;
-                    // HTML embedded media links.
-                    const htmlSrcRegex = /<(?:source|video)\b[^>]*\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s"'=<>`]+))[^>]*>/gi;
-                    const byKey = new Map();
-                    for (const match of markdown.matchAll(imageRegex)) {
-                        const altRaw = (_a = match[1]) !== null && _a !== void 0 ? _a : '';
-                        const srcRaw = match[2];
-                        const titleRaw = normalizeAttachmentTitleForDb((_c = ((_b = match[3]) !== null && _b !== void 0 ? _b : match[4])) !== null && _c !== void 0 ? _c : null);
-                        const key = getKeyFromTrackedUrl(srcRaw);
-                        if (!key) {
-                            continue;
+                    return __awaiter(this, void 0, void 0, function* () {
+                        var _a, _b, _c, _d, _e, _f;
+                        if (!markdown) {
+                            return [];
                         }
-                        upsertMeta(byKey, key, {
-                            alt: altRaw,
-                            title: titleRaw,
-                        });
-                    }
-                    let srcMatch;
-                    while ((srcMatch = htmlSrcRegex.exec(markdown)) !== null) {
-                        const srcRaw = (_f = (_e = (_d = srcMatch[1]) !== null && _d !== void 0 ? _d : srcMatch[2]) !== null && _e !== void 0 ? _e : srcMatch[3]) !== null && _f !== void 0 ? _f : '';
-                        const key = getKeyFromTrackedUrl(srcRaw);
-                        if (!key) {
-                            continue;
+                        // Markdown image syntax: ![alt](src) or ![alt](src "title") or ![alt](src 'title')
+                        const imageRegex = /!\[([^\]]*)\]\(\s*([^\s)]+)\s*(?:\s+(?:\"([^\"]*)\"|'([^']*)'))?\s*\)/g;
+                        // HTML embedded media links.
+                        const htmlSrcRegex = /<(?:source|video)\b[^>]*\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s"'=<>`]+))[^>]*>/gi;
+                        const byKey = new Map();
+                        for (const match of markdown.matchAll(imageRegex)) {
+                            const altRaw = (_a = match[1]) !== null && _a !== void 0 ? _a : '';
+                            const srcRaw = match[2];
+                            const titleRaw = normalizeAttachmentTitleForDb((_c = ((_b = match[3]) !== null && _b !== void 0 ? _b : match[4])) !== null && _c !== void 0 ? _c : null);
+                            const key = yield getKeyFromTrackedUrl(srcRaw);
+                            if (!key) {
+                                continue;
+                            }
+                            upsertMeta(byKey, key, {
+                                alt: altRaw,
+                                title: titleRaw,
+                            });
                         }
-                        upsertMeta(byKey, key, {});
-                    }
-                    return [...byKey.values()];
+                        let srcMatch;
+                        while ((srcMatch = htmlSrcRegex.exec(markdown)) !== null) {
+                            const srcRaw = (_f = (_e = (_d = srcMatch[1]) !== null && _d !== void 0 ? _d : srcMatch[2]) !== null && _e !== void 0 ? _e : srcMatch[3]) !== null && _f !== void 0 ? _f : '';
+                            const key = yield getKeyFromTrackedUrl(srcRaw);
+                            if (!key) {
+                                continue;
+                            }
+                            upsertMeta(byKey, key, {});
+                        }
+                        return [...byKey.values()];
+                    });
                 }
                 const createAttachmentRecords = (adminforth, options, recordId, metas, adminUser) => __awaiter(this, void 0, void 0, function* () {
                     if (!metas.length) {
@@ -334,7 +359,7 @@ export default class MarkdownPlugin extends AdminForthPlugin {
                 });
                 (resourceConfig.hooks.create.afterSave).push((_a) => __awaiter(this, [_a], void 0, function* ({ record, adminUser }) {
                     // find all s3Paths in the html
-                    const metas = getAttachmentMetas(record[this.options.fieldName]);
+                    const metas = yield getAttachmentMetas(record[this.options.fieldName]);
                     const keys = metas.map(m => m.key);
                     process.env.HEAVY_DEBUG && console.log('📸 Found attachment keys', keys);
                     // create attachment records
@@ -355,7 +380,7 @@ export default class MarkdownPlugin extends AdminForthPlugin {
                         Filters.EQ(this.options.attachments.attachmentResourceIdFieldName, resourceConfig.resourceId)
                     ]);
                     const existingKeys = existingAparts.map((a) => a[this.options.attachments.attachmentFieldName]);
-                    const metas = getAttachmentMetas(record[this.options.fieldName]);
+                    const metas = yield getAttachmentMetas(record[this.options.fieldName]);
                     const newKeys = metas.map(m => m.key);
                     process.env.HEAVY_DEBUG && console.log('📸 Existing keys (from db)', existingKeys);
                     process.env.HEAVY_DEBUG && console.log('📸 Found new keys (from text)', newKeys);

package/index.ts

@@ -19,11 +19,19 @@ export default class MarkdownPlugin extends AdminForthPlugin {
 
   // Placeholder for future Upload Plugin API integration.
   // For now, treat all extracted URLs as plugin-owned public URLs.
-  isPluginPublicUrl(_url: string): boolean {
-    // todo: here we need to check that host name is same as upload plugin, probably create upload plugin endpoint
-    // should handle cases that user might define custom preview url
-    // and that local storage has no host name, here, the fact of luck of hostname might be used as 
-    return true;
+  async isUrlFromPlugin(url: string): Promise<boolean> {
+    if (!this.uploadPlugin) return false;
+    try {
+      const uploadPlugin = this.uploadPlugin as any;
+      if (typeof uploadPlugin.isInternalUrl === 'function') {
+        return await uploadPlugin.isInternalUrl(url);
+      } else {
+        throw new Error ('Please update upload plugin and storage adapter')
+      }
+    } catch (err) {
+      console.error(`[MarkdownPlugin] Error checking URL ${url}:`, err);
+    }
+    return false;
   }
 
   validateConfigAfterDiscover(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
@@ -162,24 +170,35 @@ export default class MarkdownPlugin extends AdminForthPlugin {
           return u.pathname.replace(/^\/+/, '');
         } catch {
           // Fallback: strip scheme/host if it looks like a URL, otherwise treat as a path.
-          return stripQueryAndHash(url).replace(/^https?:\/\/[^\/]+\/+/, '').replace(/^\/+/, '');
+          const key = stripQueryAndHash(url).replace(/^https?:\/\/[^\/]+\/+/, '').replace(/^\/+/, '');
+
+          // since only local storage adapter returns non-URL paths
+          // we need to cut-off express-base
+          // e.g. /uploaded-static/cars_description_images-74bbe25a154500c4a2fcb91fb91cea75/sqlite/images_1775114133312.webp
+          // should become /sqlite/images_1775114133312.webp
+          const cutted = key.split("/").filter(Boolean).slice(2).join("/");
+          return cutted;
         }
       };
 
       const shouldTrackUrl = (url: string) => {
         try {
-          return this.isPluginPublicUrl(url);
+          return this.isUrlFromPlugin(url);
         } catch (err) {
           console.error('Error checking URL ownership', url, err);
           return false;
         }
       };
 
-      const getKeyFromTrackedUrl = (rawUrl: string): string | null => {
+      const getKeyFromTrackedUrl = async (rawUrl: string): Promise<string | null> => {
         const srcTrimmed = rawUrl.trim().replace(/^<|>$/g, '');
         if (!srcTrimmed || srcTrimmed.startsWith('data:') || srcTrimmed.startsWith('javascript:')) {
           return null;
         }
+        const isInternal = await this.isUrlFromPlugin(srcTrimmed);
+        if (!isInternal) {
+          return null;
+        }
         if (!shouldTrackUrl(srcTrimmed)) {
           return null;
         }
@@ -225,7 +244,7 @@ export default class MarkdownPlugin extends AdminForthPlugin {
         return cleaned || null;
       };
 
-      function getAttachmentMetas(markdown: string): AttachmentMeta[] {
+      async function getAttachmentMetas(markdown: string): Promise<AttachmentMeta[]> {
         if (!markdown) {
           return [];
         }
@@ -242,7 +261,7 @@ export default class MarkdownPlugin extends AdminForthPlugin {
           const srcRaw = match[2];
           const titleRaw = normalizeAttachmentTitleForDb((match[3] ?? match[4]) ?? null);
 
-          const key = getKeyFromTrackedUrl(srcRaw);
+          const key = await getKeyFromTrackedUrl(srcRaw);
           if (!key) {
             continue;
           }
@@ -255,7 +274,7 @@ export default class MarkdownPlugin extends AdminForthPlugin {
         let srcMatch: RegExpExecArray | null;
         while ((srcMatch = htmlSrcRegex.exec(markdown)) !== null) {
           const srcRaw = srcMatch[1] ?? srcMatch[2] ?? srcMatch[3] ?? '';
-          const key = getKeyFromTrackedUrl(srcRaw);
+          const key = await getKeyFromTrackedUrl(srcRaw);
           if (!key) {
             continue;
           }
@@ -390,7 +409,7 @@ export default class MarkdownPlugin extends AdminForthPlugin {
       
       (resourceConfig.hooks.create.afterSave).push(async ({ record, adminUser }: { record: any, adminUser: AdminUser }) => {
         // find all s3Paths in the html
-        const metas = getAttachmentMetas(record[this.options.fieldName]);
+        const metas = await getAttachmentMetas(record[this.options.fieldName]);
         const keys = metas.map(m => m.key);
         process.env.HEAVY_DEBUG && console.log('📸 Found attachment keys', keys);
         // create attachment records
@@ -416,7 +435,7 @@ export default class MarkdownPlugin extends AdminForthPlugin {
           ]);
           const existingKeys = existingAparts.map((a: any) => a[this.options.attachments.attachmentFieldName]);
 
-          const metas = getAttachmentMetas(record[this.options.fieldName]);
+          const metas = await getAttachmentMetas(record[this.options.fieldName]);
           const newKeys = metas.map(m => m.key);
 
           process.env.HEAVY_DEBUG && console.log('📸 Existing keys (from db)', existingKeys)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/markdown",
-  "version": "1.10.12",
+  "version": "1.11.1",
   "description": "Markdown plugin for adminforth",
   "type": "module",
   "main": "dist/index.js",